Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 17 Dec 2011 06:52:01 +0000 (22:52 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 17 Dec 2011 06:52:01 +0000 (22:52 -0800)
commit27c59964cd5c5bdcd4de8a25cfb9ba2b267e14cd
treeaa9eb191f667ae9fdb0e71a42dc89c10fa46b6d0
parent9e4ff08794742161a0c28fcf2558197aec9eccab
parent74ede2d42b0ad04fdf4134847481c66ff1c925ea
Merge from trunk.